Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Fri, 22 May 2015 21:23:15 +0000 (17:23 -0400)
committerTom Rini <[email protected]>
Fri, 22 May 2015 21:23:15 +0000 (17:23 -0400)

Trivial merge